From: Sascha Hauer Date: Tue, 3 Apr 2012 10:34:57 +0000 (+0200) Subject: watchdog imx2: prepare clk before enabling it X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~10914^2~8^2~27 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4e7b6c9a6b4700cf121a0d5924f193db83cbd008;p=linux-4.9.git watchdog imx2: prepare clk before enabling it Signed-off-by: Sascha Hauer --- diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 7a2b734fcdc7..bcfab2b00ad2 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -121,7 +121,7 @@ static void imx2_wdt_start(void) { if (!test_and_set_bit(IMX2_WDT_STATUS_STARTED, &imx2_wdt.status)) { /* at our first start we enable clock and do initialisations */ - clk_enable(imx2_wdt.clk); + clk_prepare_enable(imx2_wdt.clk); imx2_wdt_setup(); } else /* delete the timer that pings the watchdog after close */